Revert 5e21be1..113a39d

This rolls back to commit 5e21be1d58385e81d51b804cc96d13daffc6870d.