Revert 5a6bd7c..e350aa3

This rolls back to commit 5a6bd7c47a8e93cd8a926b19e05509300d9818fe.