Revert 6fc320f..48da2b7

This rolls back to commit 6fc320f67b8b14f7dbbbb6e641220f40b7f6fb70.