Revert 48b50c0..782f495

This rolls back to commit 48b50c0a8d1b3c06c58b8fc9ff7e525866c5c0ba.
Broken attempt