Revert 5a618f6..ca55460

This rolls back to commit 5a618f648b75d7ecb8a1f13e124d6b683efce37c.