Index: libcfa/src/concurrency/locks.hfa
===================================================================
--- libcfa/src/concurrency/locks.hfa	(revision 35d73c0bb9a6da0701936476657e2499a077fbd8)
+++ libcfa/src/concurrency/locks.hfa	(revision 7636fcc64e46f44cabe92d04feda8adb8419968b)
@@ -177,4 +177,5 @@
 };
 
+static inline void ?{}(fast_lock & this) __attribute__((deprecated("use linear_backoff_then_block_lock instead")));
 static inline void ?{}(fast_lock & this) { this.owner = 0p; }
 
@@ -184,5 +185,5 @@
 }
 
-static inline void lock( fast_lock & this ) __attribute__((artificial));
+static inline void lock( fast_lock & this ) __attribute__((deprecated("use linear_backoff_then_block_lock instead"), artificial));
 static inline void lock( fast_lock & this ) {
 	thread$ * thrd = active_thread();
@@ -195,5 +196,5 @@
 }
 
-static inline bool try_lock( fast_lock & this ) __attribute__((artificial));
+static inline bool try_lock( fast_lock & this ) __attribute__((deprecated("use linear_backoff_then_block_lock instead"), artificial));
 static inline bool try_lock ( fast_lock & this ) {
 	thread$ * thrd = active_thread();
@@ -202,5 +203,5 @@
 }
 
-static inline thread$ * unlock( fast_lock & this ) __attribute__((artificial));
+static inline thread$ * unlock( fast_lock & this ) __attribute__((deprecated("use linear_backoff_then_block_lock instead"), artificial));
 static inline thread$ * unlock( fast_lock & this ) {
 	/* paranoid */ verify(active_thread() == this.owner);
Index: sts/unified_locking/.expect/fast.txt
===================================================================
--- tests/unified_locking/.expect/fast.txt	(revision 35d73c0bb9a6da0701936476657e2499a077fbd8)
+++ 	(revision )
@@ -1,3 +1,0 @@
-Starting
-Done!
-Match!
Index: sts/unified_locking/fast.cfa
===================================================================
--- tests/unified_locking/fast.cfa	(revision 35d73c0bb9a6da0701936476657e2499a077fbd8)
+++ 	(revision )
@@ -1,8 +1,0 @@
-#include <locks.hfa>
-
-#define LOCK fast_lock
-#include "mutex_test.hfa"
-
-int main() {
-    test();
-}
Index: tests/zombies/fastlock.cfa
===================================================================
--- tests/zombies/fastlock.cfa	(revision 7636fcc64e46f44cabe92d04feda8adb8419968b)
+++ tests/zombies/fastlock.cfa	(revision 7636fcc64e46f44cabe92d04feda8adb8419968b)
@@ -0,0 +1,8 @@
+#include <locks.hfa>
+
+#define LOCK fast_lock
+#include "mutex_test.hfa"
+
+int main() {
+    test();
+}