Revert aba4bf7..975ffc5

This rolls back to commit aba4bf7049902b9cf5ee158a5dc5fde3cf2b851f.